Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 19 Oct 2011 17:16:12 +0000 (10:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 19 Oct 2011 17:16:12 +0000 (10:16 -0700)
commitc2145386f33317ada889a19e69ae286a6dd2486e
tree138c1b7a6d829eb5f761a328dac4a19a9c4b4005
parent7ac51c7ff763f27202ec42e607d1ebf2619ad35f
parentb5fc7c60de8d56a8584694e64d45c27c87b05153
Merge from trunk.